vc-cvs-checkin had some reference problems, now fixed.

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index fab59b1710c5ec85f108a3242d44da9afcdc6489..588ff4be6ba7282d69737f27ee6129c9188422a3 100644 (file)
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -342,7 +342,8 @@ its parents."
       ;; Check checkin problem.
       (cond
        ((re-search-forward "Up-to-date check failed" nil t)
-        (vc-file-setprop file 'vc-state 'needs-merge)
+       (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
+             files)
         (error (substitute-command-keys
                 (concat "Up-to-date check failed: "
                         "type \\[vc-next-action] to merge in changes"))))